(dframe-frame-mode): Don't burp when menu-bar-lines is nil.

diff --git a/lisp/dframe.el b/lisp/dframe.el
index e238a469dd50ed457737e2d474509f0b6784db4f..f77a5059026b49e919ea25e5dc3c5a8fbae9e45c 100644 (file)
--- a/lisp/dframe.el
+++ b/lisp/dframe.el
@@ -422,7 +422,7 @@ CREATE-HOOK are hooks to run after creating a frame."
                            parameters
                          (append
                           parameters
-                          (list (cons 'height (+ mh (frame-height)))))))
+                          (list (cons 'height (+ (or mh 0) (frame-height)))))))
                       (params
                        ;; Only add a guessed width if one is not specified
                        ;; in the input parameters.